Move not-null assertion before pointer de-ref.

        * gdk/gdkdnd.c (gdk_drag_context_unref):
        Move not-null assertion before pointer de-ref.

        * gdk/gdkevents.c (gdk_event_queue_find_first):
        Fix infinite loop bug.  Someone should look at this further to
        make sure the events_pending tests are correct.

diff --git a/ChangeLog b/ChangeLog
index 8af850f9a31371193ac25950064c2923e5ad8b53..0b4468d5a3fffa798327acd631325f08b7b3d9cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 21 01:15:28 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gdk/gdkdnd.c (gdk_drag_context_unref):
+       Move not-null assertion before pointer de-ref.
+
+       * gdk/gdkevents.c (gdk_event_queue_find_first):
+       Fix infinite loop bug.  Someone should look at this further to
+       make sure the events_pending tests are correct.
+
 Thu Jan 21 00:44:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8af850f9a31371193ac25950064c2923e5ad8b53..0b4468d5a3fffa798327acd631325f08b7b3d9cc 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Thu Jan 21 01:15:28 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gdk/gdkdnd.c (gdk_drag_context_unref):
+       Move not-null assertion before pointer de-ref.
+
+       * gdk/gdkevents.c (gdk_event_queue_find_first):
+       Fix infinite loop bug.  Someone should look at this further to
+       make sure the events_pending tests are correct.
+
 Thu Jan 21 00:44:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8af850f9a31371193ac25950064c2923e5ad8b53..0b4468d5a3fffa798327acd631325f08b7b3d9cc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Thu Jan 21 01:15:28 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gdk/gdkdnd.c (gdk_drag_context_unref):
+       Move not-null assertion before pointer de-ref.
+
+       * gdk/gdkevents.c (gdk_event_queue_find_first):
+       Fix infinite loop bug.  Someone should look at this further to
+       make sure the events_pending tests are correct.
+
 Thu Jan 21 00:44:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8af850f9a31371193ac25950064c2923e5ad8b53..0b4468d5a3fffa798327acd631325f08b7b3d9cc 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Thu Jan 21 01:15:28 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gdk/gdkdnd.c (gdk_drag_context_unref):
+       Move not-null assertion before pointer de-ref.
+
+       * gdk/gdkevents.c (gdk_event_queue_find_first):
+       Fix infinite loop bug.  Someone should look at this further to
+       make sure the events_pending tests are correct.
+
 Thu Jan 21 00:44:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8af850f9a31371193ac25950064c2923e5ad8b53..0b4468d5a3fffa798327acd631325f08b7b3d9cc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Thu Jan 21 01:15:28 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gdk/gdkdnd.c (gdk_drag_context_unref):
+       Move not-null assertion before pointer de-ref.
+
+       * gdk/gdkevents.c (gdk_event_queue_find_first):
+       Fix infinite loop bug.  Someone should look at this further to
+       make sure the events_pending tests are correct.
+
 Thu Jan 21 00:44:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8af850f9a31371193ac25950064c2923e5ad8b53..0b4468d5a3fffa798327acd631325f08b7b3d9cc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Thu Jan 21 01:15:28 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gdk/gdkdnd.c (gdk_drag_context_unref):
+       Move not-null assertion before pointer de-ref.
+
+       * gdk/gdkevents.c (gdk_event_queue_find_first):
+       Fix infinite loop bug.  Someone should look at this further to
+       make sure the events_pending tests are correct.
+
 Thu Jan 21 00:44:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8af850f9a31371193ac25950064c2923e5ad8b53..0b4468d5a3fffa798327acd631325f08b7b3d9cc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Thu Jan 21 01:15:28 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gdk/gdkdnd.c (gdk_drag_context_unref):
+       Move not-null assertion before pointer de-ref.
+
+       * gdk/gdkevents.c (gdk_event_queue_find_first):
+       Fix infinite loop bug.  Someone should look at this further to
+       make sure the events_pending tests are correct.
+
 Thu Jan 21 00:44:47 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling

diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index c3fdaa58bebe6401b22163504314b74856f8da9a..b2653628a5d5c0232485123267aed9c487a32a66 100644 (file)
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -131,10 +131,11 @@ void
 gdk_drag_context_unref (GdkDragContext *context)
 {
   GdkDragContextPrivate *private = (GdkDragContextPrivate *)context;
-  private->ref_count--;
-  
+
   g_return_if_fail (context != NULL);
 
+  private->ref_count--;
+  
   if (private->ref_count == 0)
     {
       g_dataset_destroy (private);

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 5eb1b7815b742d8f1396c9caaf58519d518b32f3..75dd891ddd23246cbb881c778b07fb2ea7b79c09 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -153,9 +153,11 @@ gdk_event_queue_find_first (void)
 
   while (tmp_list)
     {
-      GdkEventPrivate *event = queued_events->data;
+      GdkEventPrivate *event = tmp_list->data;
       if (!(event->flags & GDK_EVENT_PENDING))
        return tmp_list;
+
+      tmp_list = g_list_next (tmp_list);
     }
 
   return NULL;

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index c3fdaa58bebe6401b22163504314b74856f8da9a..b2653628a5d5c0232485123267aed9c487a32a66 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -131,10 +131,11 @@ void
 gdk_drag_context_unref (GdkDragContext *context)
 {
   GdkDragContextPrivate *private = (GdkDragContextPrivate *)context;
-  private->ref_count--;
-  
+
   g_return_if_fail (context != NULL);
 
+  private->ref_count--;
+  
   if (private->ref_count == 0)
     {
       g_dataset_destroy (private);

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 5eb1b7815b742d8f1396c9caaf58519d518b32f3..75dd891ddd23246cbb881c778b07fb2ea7b79c09 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -153,9 +153,11 @@ gdk_event_queue_find_first (void)
 
   while (tmp_list)
     {
-      GdkEventPrivate *event = queued_events->data;
+      GdkEventPrivate *event = tmp_list->data;
       if (!(event->flags & GDK_EVENT_PENDING))
        return tmp_list;
+
+      tmp_list = g_list_next (tmp_list);
     }
 
   return NULL;